From 3b68d7db89b7a5bbcfc8f959c2c12569f3643fed Mon Sep 17 00:00:00 2001 From: James Henstridge Date: Sat, 31 Mar 2001 00:48:37 +0000 Subject: [PATCH] fix use of magic constant "-1" in the aux info structure. 2001-03-31 James Henstridge * gtk/gtkwidget.c (gtk_widget_size_adjust): fix use of magic constant "-1" in the aux info structure. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkwidget.c | 4 ++-- 8 files changed, 37 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e38f7f7af1..cbe63d16d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-03-31 James Henstridge + + * gtk/gtkwidget.c (gtk_widget_size_adjust): fix use of magic + constant "-1" in the aux info structure. + 2001-03-30 Alexander Larsson * gtk/gtkbutton.c (gtk_button_get_property): diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index e38f7f7af1..cbe63d16d8 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +2001-03-31 James Henstridge + + * gtk/gtkwidget.c (gtk_widget_size_adjust): fix use of magic + constant "-1" in the aux info structure. + 2001-03-30 Alexander Larsson * gtk/gtkbutton.c (gtk_button_get_property): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e38f7f7af1..cbe63d16d8 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2001-03-31 James Henstridge + + * gtk/gtkwidget.c (gtk_widget_size_adjust): fix use of magic + constant "-1" in the aux info structure. + 2001-03-30 Alexander Larsson * gtk/gtkbutton.c (gtk_button_get_property): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index e38f7f7af1..cbe63d16d8 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2001-03-31 James Henstridge + + * gtk/gtkwidget.c (gtk_widget_size_adjust): fix use of magic + constant "-1" in the aux info structure. + 2001-03-30 Alexander Larsson * gtk/gtkbutton.c (gtk_button_get_property): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index e38f7f7af1..cbe63d16d8 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2001-03-31 James Henstridge + + * gtk/gtkwidget.c (gtk_widget_size_adjust): fix use of magic + constant "-1" in the aux info structure. + 2001-03-30 Alexander Larsson * gtk/gtkbutton.c (gtk_button_get_property): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e38f7f7af1..cbe63d16d8 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2001-03-31 James Henstridge + + * gtk/gtkwidget.c (gtk_widget_size_adjust): fix use of magic + constant "-1" in the aux info structure. + 2001-03-30 Alexander Larsson * gtk/gtkbutton.c (gtk_button_get_property): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e38f7f7af1..cbe63d16d8 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2001-03-31 James Henstridge + + * gtk/gtkwidget.c (gtk_widget_size_adjust): fix use of magic + constant "-1" in the aux info structure. + 2001-03-30 Alexander Larsson * gtk/gtkbutton.c (gtk_button_get_property): diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 8f6820e0b7..5500183dee 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -2169,9 +2169,9 @@ gtk_widget_size_allocate (GtkWidget *widget, if (aux_info) { - if (aux_info->x != -1) + if (aux_info->x_set) real_allocation.x = aux_info->x; - if (aux_info->y != -1) + if (aux_info->y_set) real_allocation.y = aux_info->y; } -- 2.30.2